upstream merge
authorJoakim <joakim@localhost.localdomain>
Thu, 19 Aug 2010 07:34:21 +0000 (09:34 +0200)
committerJoakim <joakim@localhost.localdomain>
Thu, 19 Aug 2010 07:34:21 +0000 (09:34 +0200)
commitd1ee12099263360ce5cebee86ecbcdeb060a6861
tree2d10f02ee1efdfd01d7c420c701b43c5b34ee5c0
parentfafd7f118539f7ef8f1f926a6bbf1506e98a0200
parentae0f9f4e60fd94aeb637f7e5b4a3c6759cf853b6
upstream merge